events: Drop GDK_DESTROY
authorMatthias Clasen <mclasen@redhat.com>
Sat, 15 Feb 2020 16:19:59 +0000 (11:19 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 21 Feb 2020 05:40:52 +0000 (00:40 -0500)
No backend is emitting GDK_DESTROY events anymore, so no
need to carry this around.

gdk/gdkevents.c
gdk/gdkevents.h
gdk/gdksurface.c
gtk/gtkmain.c

index dd7f5a48e464b1c493938caca7206d38ed24fe71..05fe42fe42eea245ae78bffaea935e055329ec73 100644 (file)
@@ -793,7 +793,6 @@ gdk_event_get_time (const GdkEvent *event)
       case GDK_FOCUS_CHANGE:
       case GDK_NOTHING:
       case GDK_DELETE:
-      case GDK_DESTROY:
       case GDK_GRAB_BROKEN:
       case GDK_EVENT_LAST:
       default:
@@ -866,7 +865,6 @@ gdk_event_get_state (const GdkEvent  *event,
       case GDK_DROP_START:
       case GDK_NOTHING:
       case GDK_DELETE:
-      case GDK_DESTROY:
       case GDK_GRAB_BROKEN:
       case GDK_PAD_BUTTON_PRESS:
       case GDK_PAD_BUTTON_RELEASE:
index 4f90cd8d076ffc6eed4c3dbd212d54b009c8b6b0..d93e2e50ad1fcfdeaa1b09131873293740b939ed 100644 (file)
@@ -131,7 +131,6 @@ typedef union  _GdkEvent        GdkEvent;
  * @GDK_DELETE: the window manager has requested that the toplevel surface be
  *   hidden or destroyed, usually when the user clicks on a special icon in the
  *   title bar.
- * @GDK_DESTROY: the surface has been destroyed.
  * @GDK_MOTION_NOTIFY: the pointer (usually a mouse) has moved.
  * @GDK_BUTTON_PRESS: a mouse button has been pressed.
  * @GDK_BUTTON_RELEASE: a mouse button has been released.
@@ -187,7 +186,6 @@ typedef enum
 {
   GDK_NOTHING,
   GDK_DELETE,
-  GDK_DESTROY,
   GDK_MOTION_NOTIFY,
   GDK_BUTTON_PRESS,
   GDK_BUTTON_RELEASE,
index dbda1833bce708c5bfbaabe71ece39debea6c22b..f397980e584ad000d69cb45a90565be13e7188fb 100644 (file)
@@ -4094,7 +4094,6 @@ add_event_mark (GdkEvent *event,
     case GDK_PAD_GROUP_MODE:
     case GDK_GRAB_BROKEN:
     case GDK_DELETE:
-    case GDK_DESTROY:
     case GDK_FOCUS_CHANGE:
     case GDK_PROXIMITY_IN:
     case GDK_PROXIMITY_OUT:
index f492b3b2b3a1861e9fc9cea6674995784b62972e..9632a1b2590198035cac206625c824b216db9907 100644 (file)
@@ -1841,7 +1841,6 @@ gtk_main_do_event (GdkEvent *event)
       break;
 
     case GDK_DELETE:
-    case GDK_DESTROY:
       g_object_ref (target_widget);
       if (!gtk_window_group_get_current_grab (window_group) ||
           GTK_WIDGET (gtk_widget_get_root (gtk_window_group_get_current_grab (window_group))) == target_widget)
@@ -2349,7 +2348,7 @@ gtk_get_event_widget (const GdkEvent *event)
 
   widget = NULL;
   if (event && event->any.surface &&
-      (event->any.type == GDK_DESTROY || !gdk_surface_is_destroyed (event->any.surface)))
+      (!gdk_surface_is_destroyed (event->any.surface)))
     widget = gtk_native_get_for_surface (event->any.surface);
 
   return widget;